Fix previous conflict.

diff --git a/src/ChangeLog b/src/ChangeLog
index 9561ee91dab7d90a408d1aa30e47d6c6e0b93865..c471b0437bfa24259f984e3d795077942d0f59cd 100644 (file)
--- a/src/ChangeLog
+++ b/src/ChangeLog
@@ -32,7 +32,6 @@
 
        * process.c (add_keyboard_wait_descriptor) [!subprocesses]: Ifdef
        away the entire body of the function.
->>>>>>> MERGE-SOURCE
 
 2010-07-13  Dan Nicolaescu  <dann@ics.uci.edu>